From 7b63edab8e03f4d0e13fbd121d93e99844a7bd98 Mon Sep 17 00:00:00 2001 From: "smh22@firebug.cl.cam.ac.uk" Date: Mon, 1 Aug 2005 10:45:07 +0000 Subject: [PATCH] Minor clean ups of time.c and partial build fixes for 2.4 --- linux-2.4-xen-sparse/arch/xen/Makefile | 2 +- linux-2.4-xen-sparse/mkbuildtree | 4 ++-- linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c | 7 ++----- linux-2.6-xen-sparse/include/asm-xen/hypervisor.h | 2 ++ 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/linux-2.4-xen-sparse/arch/xen/Makefile b/linux-2.4-xen-sparse/arch/xen/Makefile index 77da37bfaf..97a622e1bd 100644 --- a/linux-2.4-xen-sparse/arch/xen/Makefile +++ b/linux-2.4-xen-sparse/arch/xen/Makefile @@ -61,7 +61,7 @@ SUBDIRS += arch/xen/drivers/console SUBDIRS += arch/xen/drivers/evtchn SUBDIRS += arch/xen/drivers/blkif SUBDIRS += arch/xen/drivers/netif -SUBDIRS += arch/xen/drivers/usbif +#SUBDIRS += arch/xen/drivers/usbif SUBDIRS += arch/xen/drivers/balloon ifdef CONFIG_XEN_PRIVILEGED_GUEST SUBDIRS += arch/xen/drivers/dom0 diff --git a/linux-2.4-xen-sparse/mkbuildtree b/linux-2.4-xen-sparse/mkbuildtree index 714d85e69f..852781bb1a 100755 --- a/linux-2.4-xen-sparse/mkbuildtree +++ b/linux-2.4-xen-sparse/mkbuildtree @@ -102,8 +102,8 @@ for i in `find . -type l`; do rm -f $i; done relative_lndir ${RS} rm -f mkbuildtree -set ${RS}/../linux-2.6.*-xen-sparse -[ "$1" == "${RS}/../linux-2.6.*-xen-parse" ] && { echo "no Linux 2.6 sparse tree at ${RS}/../linux-2.6.*-xen-sparse"; exit 1; } +set ${RS}/../linux-2.6-xen-sparse +[ "$1" == "${RS}/../linux-2.6-xen-parse" ] && { echo "no Linux 2.6 sparse tree at ${RS}/../linux-2.6-xen-sparse"; exit 1; } LINUX_26="$1" diff --git a/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c b/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c index 7d600b5e1a..56f6316cc4 100644 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c @@ -295,15 +295,12 @@ static inline int time_values_up_to_date(int cpu) struct vcpu_time_info *src; struct shadow_time_info *dst; - src = &HYPERVISOR_shared_info->vcpu_time[smp_processor_id()]; - dst = &per_cpu(shadow_time, smp_processor_id()); + src = &HYPERVISOR_shared_info->vcpu_time[cpu]; + dst = &per_cpu(shadow_time, cpu); return (dst->version == src->time_version2); } -#define TIME_VALUES_UP_TO_DATE \ - ({ rmb(); (shadow_time_version == HYPERVISOR_shared_info->time_version2); }) - /* * This is a special lock that is owned by the CPU and holds the index * register we are working with. It is required for NMI access to the diff --git a/linux-2.6-xen-sparse/include/asm-xen/hypervisor.h b/linux-2.6-xen-sparse/include/asm-xen/hypervisor.h index 8a61a2113c..0787cc3991 100644 --- a/linux-2.6-xen-sparse/include/asm-xen/hypervisor.h +++ b/linux-2.6-xen-sparse/include/asm-xen/hypervisor.h @@ -46,6 +46,8 @@ # else # include # endif +# else +# define pud_t pgd_t # endif #endif -- 2.30.2